Fixes issue #423