Fixed Scan All once and for all!