Merge missing buffer bug fix from jaynel/history-bug