Fixed ambiguous model field handling.