fix history
now working on 3.6.12