Some input text changes, need to be fixed