Fixing duplicate field names issue