Fix generation of display data