Fixed handling of unicode params