Fixed my fix to support <PHP 5.4