a299ddc Fix static environment usage