CallerID patch: avoid conflicts with other patches