com_task fixed includes