Tethering fix