Fixes issue #486