Fixes issue #488