adaption to changed interface of pattern-matching