bugfix full fields