Be stricter when finding fields
Change some things