Oops merged patch too fast, this is the right patch