Bug fix causing multiple restarts to fail