[Phoo]: Compatible with the new changes in comments