Issue #125: Fixed the historical