Fix #470
Fix #471