WIP fixing get_last_field