Facing the same issue. Is there a workaround to fix this issue?