Fix #657