I am facing a same issue in my project, have you found a solution to this?