Bugfix and Improvment on send state timer