Fixed critical bug... again... :P