More derp fixed