Fix: arrow bug