added fix for assignment count issue