Fixed timeout issue