Second attempt at fix