Fix blacklist support