Save before tracking fix