Fixed #638