Fixed attribute mapping bug