Handle named fields more correctly