Still bugs in arrow definition...