fix bug on tracking