Hopefully fixed the display bug