Fix user history issue 2