Fixing more derp