Manually add this part of next patch