Fix #161 arrow bug