Fix for CRM-15487