Updated for PHP 5.4