Fixes issue #55