Updated to fix typo in last merge

The last merge had a typo in the commit message. I had to clean that up by adding another commit.