Progress on fix