Working on fix for issue 27bd61c, The scanning works, but it is 'leaky'