should be the final fix tonight