Fixes #235