fixed a derp from a merge