fix channel and timeout