Attempted to fix server/client synch issue

Fix seems to work with preliminary testing but don't know for sure