Stupid Bug fix