Fix reapeated keywords bug