Attempt fix for PHP 5.4 and 5.6