[Fix] From Feedbacks.