This is to fix in main branch as hotfix for the workshop!