Fix Gem interaction with selfdestruct moves