[Bugsy]

I didn't test compile since I'm on my phone. Do you get the same warning when compiling the revised code? If so I'll take a look later when I get home.