Count and sum are now correct