Fixed attribute mapping issue.