Moved around_transition out of protected block