Fixes issue #119