Created attachment 144565 [details] [review] proposed fix FINALLY!!! I fixed the issue. A small patch with a fix is in the attachment. Feel free to suggest a better solution, but it works for me without any issues.