Fix display behavior