Fixes #296