Hotfix for late users
Prepare for no-stage phase