empty name bug fixed