Bug fix in Kernel