Added restart
fixed possible event listener removal timing issue