Fix #629