fixed ScanActor issue
merge conflict