Fixes #323