Bug Fix: UTF-8 input handled more gracefully.