Fixed display bug