Watched bounds scan fix for #244