Added a long grace as a workaround to the incremental sync issue