gh-126 fix broken