Bug fix for key_match