Fix display not returning correct value