Fix instance registration