Better fix
Fix for multiple collapses with right commit