Closes #1455. Finer grained sync