Fix for stricter thimblerig field check