Fixed #628