Another attempt at fix.