Should solve some sync problems