fix gh-1954