Fix recently introduced overflow check (again)