working on fix