[#65625926] simplified things in the hope this will help with the issue that's rather hard to reproduce