Fix for issue #163 Easiest fix ever