Working commit - PHP 5.3 support