BS: Fixed bug. Restart should work after timeout as well