Closing #31. Also fixed for text boxes.