Fixes #383