Fix last patch