Merge pull request #557 from danvk/sync-glitch