Try to fix svg issue again