Fixed bug for tracking helper