This is here till mlehmann gets a clue