Changes for PHP ver. 5.4