Fixed assignment count reset issue