#202 quantifier update