Really fix #470