more correct constant tracking