Fixed #226 - Eliminates ordering issues in the SyncMessage protocol

Seems like we're duplicating code here?