Attempt to fix #88, changing way how long messages handled