Change register method, fix POR-2588