[BUG-15347] ObjectWrapper modification

@PGriffith

Probably related to the same changes causing this: [BUG] tolist() broken in 8.0.5