Fixed out-of-sync bug for initial/final nodes
Still buggy when dealing with server side stuffs