How the hell. I already fixed that. Just a minute.

Somehow I lost the change that fixed this before. Anyway, I fixed it again and pushed the changes. I've also set up to create branches so I can compartmentalize the code changes for various functionalities.