Yet another try for fix.