Fixed up to work with CiviCRM 4.4