Name trim fix