Fix #322