bugfix on tracking