Fixed a merge that went wrong.