Attempt to correct gh-3