Fixes #231