distribution set workaround