Fix for tracker