Fixed crazyness with help of Phil