Fixes issue #572