final fix 2.0