Fix towards CRM-12490