fix fields ordering