Fixed out of bound issue
Revert "Fixed out of bound issue"

This reverts commit 43ac3f5653d99978c0ab6867ae77434c089e3276.