Bugfix with fuzzy match