Fixes #297