How about the untested attached patch?


Bjørn