Fix kernel issue