Cookie-Handling of Goma improved