Fix object handling, refs #28