Fix no-clobber option