Fix bug with Double run!