Fix for poorly detected signatures