Fix for CRM-12359