Added user history fix