Partially fixed arrow bug