New attempt at fix.