Attempt at fix.