Fix for trickle between SetRemote and SetLocal. Fixes #181