Here is an updated version of the patch: