More effective fix.