PatchRecoveryEE bugfix from Manav Bhatia