fixes gh-1954