Fixing set_live_variables