FastScan fix