Created attachment 91609 [details] [review] testing patch Does the attached patch help? If so, try and narrow down which changes fix the issue.