Fixes #299