bp000-fix-issue-139.diff

