Next shape display bug fix