Hopeful final fix