Fix for CRM-15421

Fix for CRM-15421