Dev hotfix