Enhanced fix.