Fixed "extremely long transition" issue