Fix display bug
Second attempt at fix