Made small patch for object dumping, should probably have a more general solution