Bugfix sending and timeout