work on fix45