Fix with unicode