[Phoo]: Compatibility with the new changes in comments