fix 'and' operators