Fixes #295