Thanks for updating here. I can confirm with latest code removing the manual workaround things work fine.