finished fix