Fix 'between' condition #596