Bug: 13386  Tweak logic.