More robust fix for position tracking issues