Issue70fix