Fixed PHP5.3/5.4 inconsistencies