minor adaption to #6