Bug fix for PHP8