Fixes issue #71