fixes issue #51