Fixing the transition control