Client timer issue fix