Fixes issue #472