Oops - committed with red tests :-( Now shut up please...