fixed assignment conflict