bug #5297 :   Fix bug #5299