case 3478 - CR fix.