Revert "Fixed Undefined index warning"

This reverts commit 011b189b0f913a1783e3ca75a7cc749dc7255e2c.