Fix merge issue from supervisor.