Trying again to fix compares.