fixes issue #532