Have you found any solution for such cases?

I've faced the same issue. Have you found a workaround to make it more robust?