Fix for CRM-12409