Fix #643