Fixes issue #388