Here is an updated patch: