better handling for quick transitions with arrows