Fix mondalaci/supervisor-client BC break