Fixed not going to the End screen