Fix some history bug