Fixes #270