Fixes #265