Fix derp/infinite loop/crash