fix or charset logic

I think it should use `&&` here.