change for toRowkey bug fix