#257 - improve handling of whitespace in cc action