Fix for Tracker 31973