gh-140 likely final fix