Fixes #268