Fixed TextField

(which I broke because I don't test all the things).
Merge remote-tracking branch 'origin/master'