proposed fix for CRM-17555