fixing transitioning