Fixed transition issue