Fix for Worklist Job #19503