fix gh-17