Second attempt to fix.