Fix Initial X assignment