Enhanced fix