Fixed issue #4, hopefully