Fix for tracker not matching user defined trackers