Transition bugs completely removed