Re-register in more cases