Apply Jack's suggestion and update the patch accordingly.