- improved time out handling