Another bug fix for PHP 5.4+