getter fix on Match