fix transition
Sync with master