Fix bug on non-word input