Fixed asking to finish everytime