Fix registration process by replacing buggy module #1334, #1626