#10 - fix display