Fix environment callback regression