Fixed bug with initial display