Fix for crash in History page