Fixes issue 117

Fixes issue #117