Fix: Scan of correct dir when them dir is forced