fix gh-26, take 2