fixed tracking bug