CRM-15423

Fix For https://issues.civicrm.org/jira/browse/CRM-15423