And now fix PHP 5.5 and 5.6 compatiblity >_>