minor adaptions needed for reorganization of
@dbc627a7631b1f8d550ed8d12eef60881b822ba2