Fix duplicated registration