Fixed Arrow bug