Fix Exchange sync issue