Good idea. Will change here and in the timeout restart.