Almost final fix