fixed tracking bug that appeared because overriding the tracking function