Fixed latest commit.

I missed some edge cases.