HACK: client pointer use-after-free "fix" part 2