Fixing transition issues