Ming Jin: fix attribute mapping issue