Fix: display not correct