Fix for CRM-15264

Fix for CRM-15264