Handles character encoding better now.