Fix object resolving