Fix gem interaction with selfdestruct moves