Fixes issue #56