Having a similar issue, code looks very similar as well…
If I get an answer that is helpful, I will try to help out if i can.