final arrow fix