Fixed a last second bug I introduced last PR
Merge pull request #76 from unwin/develop

Fixed a last second bug I introduced last PR