case 2257 - Fix after CR.