Duplicate field fix