Fixed the transition problem