Fixed text input issue from #36