Fix timing problems due to mechanic changing timeout to 0