Applied change suggested from RT #55162