store_tracking fix