Fix memory corruption issue
Update dscanner