Trying again to fix channel overflow bug