Added a limit to block scanning. For #1873