[M]adapte for new kernel