Two Bugs, One Func(), part two

Apple's 'fix' for a macOS kernel panic, fixes nothing and worse, introduces a new bug.