Fix #628