This here should not be necessary because of your change to `get_stage()`.