Fixed the craziness