Yet another attempt to fix.