Fixed civicrm issue