derp fixes 2