Seems we have a deadlock scenario again.
I will try to fix it.