Fixes #291