fixed transition bugs