Fix non quoted one.
Merge branch 'fix_non_quoted_one'