Fixed syncing issues between server and client (hopefully)