CRM-15665

Proposed fix for CRM-15665