Fixes issue #775