Fixed arrows bug