Fix for CRM-15473

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