Fix assignment counts
Fix assignment counts