minor adaptions for 4.2.3