fix on enabling or disabilng tracking
fix on decoding function