Proper workaround

The code is still wrong but at least it is not executed when tx log is disabled (as it should be).
Merge pull request #123 from wajam/manu-consistency-workaround2

Proper workaround