Supervisor fix