Fix ice hang rebased