CRM-12836 : applied patch, working fine