WIP - Try to fix remote sync problem

Try to fix remote sync that doesnt work. This need to be more tested.