fix something bug not finish yet