Merge final fix