Forgot to fix a merge problem