Fix for channel names with spaces

Fix for #691