save track + fix