Bugfix: field conversion
Bugfix: nullable fields