fix AND conditional, fix warning