fix for matching functions