Fix one of the desync problems