ANother attempt at a fix.