fixes issue #528