Fixed #322