Fix M22 to not be on FINAL