Fixed new PHP support