#155 added missing field count