fixed tracking again