fix transitions
fix transitions