final fix 1