Bug fix + arrow