Fix #470