Fix to Cable removal