handle IndexOutOfBound & testing commit