Fix for tracker item #33653