Bug fix in scanner checks