possible fix for a matching bug