remove double assignments
correct assignments