Bugfix counting of loaded fields
Merge branch 'master' into develop