Fix bug with arrows