Branch110

OK, that makes sense. I thought it looked good until I found data corruption. I didn't analyse it in detail, just found the change that broke things and reverted it. 

Go ahead and make the change as you propose and submit a PR for it. (Can you please include only that change in the PR?)

Thanks!