Reworked the clearing of forwardHistory