Fixed small merge error from last commit.