Never mind. The first patch was incorrect. I have attached a new patch.