Fix initial registration