Fix #644