hopefully fix incorrect object for mapping bug
bug fix for incorrect object mapping