And actually, fix a horrible derp