Fixed: name bug