Fixing display bug