Fixed the check of infrastructure fields. Fixes #77