corrected some mis-placed code from commit #9517cc7486