Fix derp after merge