fixed client timeout due to timer not stopping