Also, doesn't this need to be done *after* we subscribe to state changes for consistency?