Fix XXX.php  just a little
(cherry picked from commit f5d1ba9)