Fixes issue #403