Hotfix from debugging code