Extra  check to match 2.2