Hotfix to fix infinite loop once again