fixed double assignments