Fix return type in control environment