Fix CRM-13982 with patch