Fixes

Now it scan only what it can