Empty staff hotfix