Fixing CLI sync