ha ha more hacks... I fear this is buggy, but the bugs might just be really old bugs - that never surfaced because the API wasn't used...