Trying to fix sync issue