Fixed name field bug