Better fix for the history privacy issue