Bug 21641: (follow-up) Address additional call