oops: Fix issue with dynamic field lookups