logic/expect debug hotfix