near final fix