Had to rebase away garys recent bug fix due to not squashing, this adds his fix back (thought sadly now he wont get credit in the commit log).