Hm, slightly nasty indeed, if you find a better solution I'm all ears.