and fix error of using [] with a function in PHP 5.3 Change-Id: I0199d6495af7f9df3c1935d6581a13f087b6dea1