#546 [/channel/sys] issue.

Sorry about the other two files....not very good at cherry-picking yet..
#546