better crazyness fix