Fix Empty RowKey issue