More work on SVG hack