Hotfix match loops