fix wrong key names of returning object