CRM-13795 related fix