Fix for CRM-15420

CRM-15420