Fixes issue #96