Fixed the bug fix issue

I must have seen these commit messages so many times if I had a penny each time, I would be rich by now.

For the sake of your cherry-picking colleagues please don't bundle multiple fixes in a single commit.