adapt the Fix for tags with 4-digit