History logging
* re-enable
* fix #1018