Better fix for tracking history when not using CLI