Make it works after r242941