fields bugfix