Drive by format fix