Fix for CRM-15264