missing changes for #347