Fixes issue #705