Trying to tweak logic to get around a display bug