Created attachment 129379 [details] [review] patch - possible workaround Does the attached patch help?