Fixed a merge error I introduced in the last commit