Does there need to be some sort of limit here to prevent desync by overflow?