Dirty tracking fix