Fix for tracker using new conversion