fix registry support