Attempt at fix 2.