Fix to object field handling