Fixed issue where channels could be resolved multiple times