Made PHP 5.4 compatible