Fix for CRM-15421

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