Has a fix been found for this? Facing the same issue currently.