case 2239 - Revised commetns. Applied fixes.