Bugfix to eliminate clashes in workflow identities