fixes issue #470