Fixed bug with names