fixing tracking