fixed baseline to work with all envs