BUGFIXES
Followup to my previous commit.

SHIT ===> GOLD