fixed CCOM ("todo" tags were missing)