Fixed Parsing Error; No channels version added
merge fixed