gh-77 another fix