Added timeout to restart