fix object handling