Fix derp #2 from merge