Possible fix for #2

I think this fixes the desync issues reported in issue #2. This will need more testing and a sanity check, and a similar fix is required for lanterns.