Fixes issue #51