Minor kernel change for safety