Fixed #167: Not everything gets logged in History