I tested with just this second patch and it did not help. Do you want me to test with both patches applied?