Better deal with disabled fields