State changes fix. Now state changes immediately after transition complete.