I tried to make very crude patch (attached), it seems to work but may be you dislike double directory creation (first pathname + "_" dir, then "/Proxy/" inside it?) feel free to simplify...