Better rescan fix