Fix for channel overflow