Fixed Insert/Scan Logic