fix history
now working on 3.5.15