Fixes issue #440