Scanning improvements
Fix for not scanning