Fixes #298