Fix derp logic