Further fix for previous commit's display bug