further header to be repackaged for #656