whups, have to implement this elsewhere, too :)