Complete fix, everything should work now.

Bug-FREE :D