Fix Arrow Bug