Flip the order of checks here too.