Fixing from local to remote