fix bug in or/and short-circuit evaluation