Fix name bug