Fix Resolve Object problems