case 2589 - CR fix.