Finished fix