proposed fix for CRM-19892