Sync issues. Fixes #14