Sync (master) fixed