Update code to work on PHP 5.3 as well