WOrking on fix