fix: change order of functions to prevent warning of fields not being in array;