Added some debug info, added more logs, tested the workaround.