First attempt at fix