Fix keyword update keywords out of bound