Fixes #322