Fix object support