Actually fix transitions for sure this time.