Finally use the new algo for stroke+fill