fixed wrongful return preventing match stop