Fixed setNextShape