fixes issue #58