Consistency & PHP 5.4 fix