Fix regarding gh-1