The patch without any whitespace fixing