after final fix