Correct distinction between unicode and bytes (Closes: #257)