Round two of fix.