addresses #322