Attempt at fixing sync issue