Tidy up fix for PHP 5.3.6