Should fix #2 & improves server syncing again