true fix for the previous issue.

will keep the previous patch, so that any future code issues dont' break
things at random.