Fix #621