Fix for CRM-12431