Fixed #662