yet another step towards more consistency...