Fixes issue #405