Add increments fix message threads

Fixes #39 
Alternate solution for #38