Fixing failed sync from upstream