Same comment than before, perhaps we could precalculate the fields just for the sake of readability