Hotfix/adjust register verify