Updated patch with the suggested changes.