bugfix: fields