Fixes issue #68