CRM-13973-qa : fix for the critical bug found mentioned in comment : 58222