and phpdoc fix