Fixes #767