arrow bugfix