Fixed crazy bug