Possible fix for tracker issue