Fixes #269