fixes #470