Fix play again bug using delegation