fix for scanner synk
Merge branch '1196_fix'