Fixed bug with name recognition