hotfixing collapse