Revise tango buffer freeing mechanism