Temp kernel fix