Final fix for PHP5.3 and little micro-optimization