Fix for CRM-15458

Fix for CRM-15458   

https://issues.civicrm.org/jira/browse/CRM-15458