case 1759 - Revised comments. Applied fixes.