I'm facing the same issue, has anyone come up with a workaround for this?