Fixed issue with RowKey not being generated