previous version of matching seemed to be faster in most cases ...