Fixed bug: name is undefined