bug fix in ObjectWrapper