Multi Match support fixes #270