Improved thrown matcher