Possible fix for issue revealed in issue #157

Thanks to Christopher Balz (https://github.com/christopherbalz) for fixing this issue!