Use a better compare