A second attempt at that fix