Fixes issue #64