Fixing a merge error from my last commit.