Some final fix