progress on fix