Fixed #630