Fixed issue not using correct channel