Changed Arrow's implementation.