Fixing transition issue