Search clobber fix