Attempt at fixing display bug